824153
@@ -771,6 +771,9 @@
public class HTable implements HTableInterface {
    */
   @Override
   public ResultScanner getScanner(final Scan scan) throws IOException {
+    if (scan.getBatch() > 0 && scan.isSmall()) {
+      throw new IllegalArgumentException("Small scan should not be used with batching");
+    }
     if (scan.getCaching() <= 0) {
       scan.setCaching(getScannerCaching());
     }
